menuitem: don't read wide-separators or separator-height
authorCosimo Cecchi <cosimoc@gnome.org>
Wed, 30 Dec 2015 01:40:30 +0000 (17:40 -0800)
committerCosimo Cecchi <cosimoc@gnome.org>
Sun, 3 Jan 2016 08:42:51 +0000 (00:42 -0800)
Separators inside menus are working completely through CSS since
GtkMenuItem has been ported to use a gadget.
Remove this unused code from here.

gtk/gtkmenuitem.c

index c3a9713e43e3c905153eabe2dac241f5d520bd34..c931e5290c15ba3b1e1cf103edbe3c75f6df4134 100644 (file)
@@ -556,32 +556,6 @@ gtk_menu_item_real_get_height (GtkWidget *widget,
       min_height = MAX (min_height, arrow_size);
       nat_height = MAX (nat_height, arrow_size);
     }
-  else /* separator item */
-    {
-      gboolean wide_separators;
-      gint     separator_height;
-
-      gtk_widget_style_get (widget,
-                            "wide-separators",  &wide_separators,
-                            "separator-height", &separator_height,
-                            NULL);
-
-      if (wide_separators)
-        {
-          min_height += separator_height;
-          nat_height += separator_height;
-        }
-      else
-        {
-          /* force odd, so that we can have the same space above and
-           * below the line.
-           */
-          if (min_height % 2 == 0)
-            min_height += 1;
-          if (nat_height % 2 == 0)
-            nat_height += 1;
-        }
-    }
 
   accel_width = 0;
   gtk_container_foreach (GTK_CONTAINER (menu_item),